Again update to latest 0.9-SNAPSHOT changes