Merge "Clean the unused flags" into main