4.9 Toolchain Modifications