Merge branch 'jk/a-thread-only-dies-once' into maint