4.9 SM fix
4.9 Toolchain fix