RavenDB-2147 for 3.0 branch