Update to v7.18