[arch-dev-public] Heimdal changes