Merge CI file from TS branch