Sync with master

Conflicts:
	src/thread.cpp

bench 8198667