Merge branch 'pt/am-builtin-abort-fix'