Merge "Fix multiprocess setting"