Merge "Replace StringBuilder with more efficient String concatenation"