RavenDB-1090 and RavenDB-1103