Update to v6.11