Merge from origin/dev to fix the threads count issue