Merge branch 'tc/fetch-leak'