Merge "Fixed potential string conversion issues"