Merge "Fix TCS crash due to API changes." into pi-dev