Merge "Fix clamp changing persistence permissions"