Merge pull request #11190 from wmortada/CRM-21344