Corrected application of CV's mask on state change (refs #4162)
Merge pull request #949 from eguaj/3.2-A4162

Corrected application of CV's mask on state change (closes #4162)