Refactor multiprocessing setting names
Merge with origin/master