Migrate to 3.4 #6585