Merge "Fix typo in flag name" into main