Merge "Fix bugprone-string-integer-assignment warnings"