Merge "Fixed issue where only the last line was aligned in the case of a multiline...