Merge branch 'pt/am-abort-fix' into maint