Merge with master. Kept new solr test results