Merge pull request #4317 from FernetMenta/dts