upgrade to 2.6.17-SNAPSHOT