Upgrade to 4.5-SNAPSHOT