Changes related to latest tfs
Merge pull request #1315 from EPuncker/master

Changes related to latest tfs