Merge pull request #9854 from adixon/CRM-20040