Merge pull request #8202 from agileware/master-crm-18356