Merge branch 'ma/builtin-unleak'