Update to latest 6.8