F/merge proto

the input queues are not protected by the mutex, so it's not safe to access that from a different thread.

This _may_ be ok, however a detailed comment is due why that's the case.