Merge pull request #7220 from ucam-dar/CRM-17556