Added support for v1.7.10