Merge branch 'multipleThreads' into newdevel