Merge branch 'ab/die-errors-in-threaded'