[GIT PULL] TI changes for 2020.04-rc1