Switch TSK to upstream with DFXML update