Merge "Reland "Prevent local overrides and error for RO flags"" into main