Migrated to 3.2 #5598