Merge "threaded" branch.