Use tagged versions of tb, tv.
Merge branch 'master' into layer-instance