Merge branch 'ns/am-abort'