Next iteration with 0.8.1-SNAPSHOT