Merge branch 'jk/bug-to-abort' into maint