[GIT PULL] TI changes for v2021.10-rc2