Merge branch 'rs/am-builtin-leakfix'