am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."

* commit '3e809794fe558d8a10851c0ac22a65a2c81fa315':
  Fix handling of wrapped processes [part 1].