Merge "Marks document provider and client forceQueryable" into rvc-dev