Upgrade to version 3.7-SNAPSHOT