initial 1.6.2 migration