Merge "Remove flag that is unused" into main