Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev