Merge pull request #6259 from systopia/CRM-16871