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