EB-7159: Red error message bug fixed
Merge remote-tracking branch 'upstream/prodsupport' into prodsupport