Migrated to 3.2 #5598
Merge migration to 3.2