Allow a tunnel_identifier to be provided
Merge branch 'allow-tunnel-identifiers' into merged-fixes