merge from tfs.localnet