Backport the Solr indexing improvements