Merge "Add missing Rule for Flags" into main