Merge branch 'jc/maint-am-abort-safely'