Merge branch 'wip-machine-based-workers' into next
Merge remote-tracking branch 'gh/next'