Merge branch 'tsc2005' into next