Merge pull request #7176 from christianwach/crm-17543