Merge branch 'rr/am-quit-empty-then-abort-fix'