Merge branch 'master' into speed-up-enqeue