Update to 6.9 stable