[DF-771] implemented