Merge pull request #8900 from scardinius/crm-19236