Upgrade to 1.5.8-SNAPSHOT