Merge "Makes TCS methods non-abstract" into pi-dev