Migrate to 3.2 #5794