EB-7154: Bug fixed (On behalf of Vijaya Chilukuri).
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15