Merge "Added/Removed spaces around string concatenation"