sync up to LUCENE-5792