Hello theire,
so if i understood correctly "only" the RDM's are affected?.
So if yes > i would also use that Way beeing able to mask the Storage.
Because Problem is if you shutdown Stroage without masking > horrible Problems could happen. ;(.
Important would be afterwards once you're storage is ready again.
- Make same "Dec. ID" for the Zoning
- delete Masking
then nothing should happen 
PS: if you like you could try out the masking script which i used in the Past for version 4.x.
i would push it to you through PM. don't know how to attach a file. Because code are longer. Have 2 Scripts. (1x masking, 1x delete masking).
best regards
Max