Fix hang-up problem on dtterm
Merge branch 'develop'