CRMV-2756: first steps
Merge branch 'CRMV-2756'