[GIT PULL] tilcdc changes for 4.17