Merge "Fix 'tautological-constant-compare' error" into integration