Merge pull request #7894 from eileenmcnaughton/CRM-18128-buffer