Merge pull request #11197 from agileware/CRM-21104