Merge "Monitor the right interface re VPN" into jb-mr1-dev