Upgraded to v2.7.0