Merge single change from local solr_client branch