BS-6931
Fix npe
Merge remote-tracking branch 'origin/master' into DataManagement