Merge Tectu changes