Update fork to v0.1.16

Re-applies agent tunneling patch