* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb': DO NOT MERGE: Fix build after checkThread fix merge to master