Merge "Remove unnecessary flag check" into main