Merge pull request #4703 from hbl0307106015/tdb