Merge branch '1770_tcc_build_fix'