8 Commits (revert-1163-thread-defaults)