Merge pull request #2851 from mstorchak/tgt