several changes for 0.12-SNAPSHOT