Merge branch 'master' into worker-info