Merge "Update flag docs" into main