Merge branch 'dm/make-threaded-simplify'