Merge branch 'master' into features/fork_workers