Merged latest updates from TEC1-Combined