proposed changes LUCENE-5625