2.1 to 2.2 MDES migration for cases #3627

Rebased on develop branch.