Merge branch 'leak-fixes-33126'