Migration from 3.6 to 6.2