Null check
Merge remote-tracking branch 'origin/feature/bbEnhancements/26.0.1410.43' into feature/bbEnhancements/27.0.1453.110