edits that should have gone in 8.1.6, but did not make it in time.  Are
on V8_2-branch.  #4324