Merging tc-nr-2 into master