MPS-19235 Cannot Run Tests in MPS
Rebuilt
Merge branch 'MPS3.0'