Merged Solr changes.