Changed thread project to stay in sync with master