Merge "remove multiline strings with A&AI client"