MPS-20052 - removed the offending dependency
MPS-20022 - checking for null expression
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/vaclavNullFix
Merge remote-tracking branch 'origin/MPS3.1' into 3.1/vaclavNullFix