stable to default
Set threads to run in the background
Merge remote-tracking branch 'origin/bug24965' into stable