Merge "Removing obsolete flags" into main