MPS-19564 Error Messages during Build Script Generation
Merge branch 'master' into 3.1/mikev/test
make after merge
MPS-19564 Error Messages during Build Script Generation (invert option, fix bug)
Merge branch '3.1/mikev/test'