SOLR-6879 - Backport