Upgraded to v2.6.0