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