Squashed 'wicker/' changes from 309fa01..03b8c6c

03b8c6c thread related imports

git-subtree-dir: wicker
git-subtree-split: 03b8c6cb449a6d07f2e048e9e5ac8ad20584f5cb
(wicker) Thread-related imports.