Migration to 3.2 #6334