Merge "Update the fully qualified flag name." into main