[GIT PULL] TI changes for v2020.04-rc4