Fix threads area cut off issue
Merge remote-tracking branch 'origin/dev/temp' into dev/temp