Update to v6.07