RavenDB-1537  (work in progress)