Merge pull request #7700 from xurizaemon/CRM-17909