Merge "Fix handling of wrapped processes [part 2]"