Merge "@EnforcePermission migrations"