Merge "Fix unsigned num comparison with zero" into main