<h1>Nodes cherrypicked into v1.8031:</h1>

<verbatim>

   583699e19c
   99a884c695
   1bc5f2dab3
   8b9deb0772
   40cce970c0

</verbatim>