[bug fixing] TDIS-7020