Merge "Remove redudant string conversions" into main