Merge pull request #8551 from scardinius/crm-18815