am d596a671: am ff9d95d5: Merge "Tweaks to patchoat and other related things."

* commit 'd596a671f5de02174369b96af6739158cb67428f':
  Tweaks to patchoat and other related things.