* commit '3c88a685021a5acd099dc7625a11e8d98f0e8fbe': DO NOT MERGE: Fix build after checkThread fix merge to master