[DF-421] Bugs fixing according to the document sent.