Update to v6.05