Migrated to 3.2 #5275
Merge migration to 3.2