SOLR-4808 changes from the JIRA patch