Changes related to latest tfs