Migrate to new Gradle version
Fixed bug with bookmarks being loaded twice