[GIT PULL] Coresight changes for v6.1