[arch-dev-public] Toolchain changes