Merge branch 'ph/enable-threaded' into next