edit doc for #4138, and add a couple of index entries, when I could not
find what I wanted to understand this ticket.
Merge branch 'V8_3_0-branch'