Merge "Distinguish internal vs external tunnels"