Merge branch 'jk/am-leakfix' into maint