Merge pull request #9779 from WeMoveEU/CRM-19963