Merge branch 'jk/unleak-fixes'