Merge branch 'pt/am-abort-fix'