Upgrade to 2.5.17.6