Merge "Fix -Wenum-compare warning" into main