RavenDB-1889 Reapplied RDBQA_6 to 3.0