Merge "Offer to "fixup" GIDs used for app data." into oc-dev