Merge "Fix cts." into pi-dev