Merge branch 'tun-cleanups'