Merge branch 'jk/am-leakfix'