Merge "Add flag support to styles elements" into main