Merge "Moves forceQueryable to the R section of public.xml"