Merge branch 'np/auto-thread'