Merge pull request #6538 from systopia/CRM-17047