Upgrade to 4.4-SNAPSHOT