Merge branch 'fixThreadsIssues'