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

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