[DF-1213] Implementation of new requirements.