worker

You'd better merge the other request first (this one is a single commit)

Just made it on the top of the other branch to not have to rebase twice.