Merge branch '1749_sunstudio_compiler'