Tunneling improvements
Merge remote-tracking branch 'origin/janjelle' into janjelle