Merge pull request #11586 from alifrumin/CRM-21711