Solr pilot merge with master branch