Merge branch 'jk/decoration-and-other-leak-fixes'