Fix process control move
Merge branch 'master' into best_practices-refactor