Merge "Reduce lock contention when starting process (1/N)"