Merge "Remove flag performance workaround" into main