Upgrade to 3.7-SNAPSHOT