merged upstream dt-dev and made changes accordingly.