Merge "Fix nested run as shell exception"