Merge "Improve error messages to encourage use of @EnableFlags and @DisableFlags" into main