Migrate to 3.2 #4943