Merge pull request #10988 from jmcclelland/CRM-21194