Merging NoSQL implementation branch to Gradle branch