Upgrade to 2.3.7-SNAPSHOT