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