Started working on 1.7-SNAPSHOT