Merging tc-nr-2 into master
updated agent name + guid