Merge pull request #16533 from Th3l0newolf/apache-solr