am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"

* commit '4ac5775d63791ae3635882a3b49f5ebc253262bb':
  Fix handling of wrapped processes [part 2]