[Cin] Fwd: GIT checkin of Masking enhancements +