- Replicated changes for issue RavenDB-2321 from the 2.5 branch into 3.0 branch and RavenFS.