Add compiler directive
Merge branch 'master' into CodeBetterBuildServer