Merge pull request #1670 from systopia/CRM-13428