Bring in r199804 and r206397 from base to avoid killing in high-pressure swapping environments.
Merge branch '5.8p2'

* 5.8p2:
  Bring in r199804 and r206397 from base to avoid killing in high-pressure swapping environments.