Merge "Add missing flag stanza" into main