Changes for 0.9.9-SNAPSHOT