Merge branch 'SHOP-4716' into 'release/5.00'
null check - SHOP-4716
See merge request !1428 (merged)
(cherry picked from commit 0b5942a5)
a21fef94 null check
null check - SHOP-4716
See merge request !1428 (merged)
(cherry picked from commit 0b5942a5)
a21fef94 null check