Merge "fix(ti): fix TISCI API changes during refactor" into integration