3.7 migration

Changes for 3.7 compare and migration