MPS-18734 errors after baseLanguage regenerating
Merge remote-tracking branch 'origin/MPS3.0'