Merge "Remove unused flag" into main