@Chris,
Thanks for pointing that out. It looks like the masking is a part of 5.2.x. Does your release strategy include back porting fixes to older branches, like 4.2.2 in my case?
Thanks.