[GIT PULL] CoreSight changes for v5.20