Merge pull request #10615 from mepps/CRM-20828