RavenDB-2842 for 2.5