Merge pull request #5377 from mstorchak/tgt