Merge "Update EnforcePermissionFix to set fix name" into main