[TASK][DD-735] small changes