Apply 6.1.x changes