Added workaround for SOLR-6712