Merge pull request #6618 from mallezie/crm-17106