Merge pull request #14100 from rohitwaghchaure/tds_issue

[Fix] TDS issue