Merge Tectu Changes