4.9 Toolchain Patch