Merge "fix TDIS-601"