Migrate to 3.2 #6575