Merge pull request #4693 from jaapjansma/CRM-15702