Merge pull request #10838 from jmcclelland/CRM-16964