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

<verbatim>

   583699e19c
   99a884c695


</verbatim>