Merge branch 'master' into add-worker-test