See individual commits.
Relates to Investigate tunnel registration GC spike w.r.t ... (#589 - closed).