First 1.7.10 migration