Work on RavenDB-1815