Merge "Fix some *TS suite that use common-compatibility-config"