Add other changes from 5.x - 6.x