Upgrade to 0.8.6-SNAPSHOT