Add Tunnel support if available

Merged Julien Wadel requested to merge feature/tunnel into master

Add tunnel special options for developer

Merge request reports