Merge pull request #22706 from mwarning/master_dhtd_022