Start of 1.7 migration