Migration issues from 3.2.2 to 3.5.2