[Cin] GIT checkin of Masking enhancements +