enqueuer should update domain in headers accordingly
Merge branch 'master' into portable