Merge changes Ie6c38a4c,I436609d9

* changes:
  Makes settings provider queryable by all
  Makes forceQueryable public