Merge "Add missing checkThread"