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)
Merge pull request #947 from thingthing/3.2-A4163

Restore vault table even if no file are saved in archive (closes #4163)
Correct PU: add folder and family (refs #4151)