Merge "Fix build after checkThread fix merge to master"