Merge branch 'master' into tasks-queueing