U/salnikov/dm 621

so we create a new ticket for it? Or could it be done in this one?