Update to 0.9-rc4-SNAPSHOT