Fix regression, bump masks version

So, this is basically it.

TODO:
1. Recheck all masks and all masks in spots iop
2. Fix 2 commits marked with [FIXME]
3. Implement magic button that will (semi-manually) recover masks created with DT version between 0a3a5574fdc9b33792fda4d29be8445545ea8a92 and `this pr merge commit`.