MPS-19374 - checking for null added
Merge remote-tracking branch 'origin/MPS3.0' into 3.0/vaclavFixes
Rebuilt