[DF-1483], [DF-1486] are fixed - Code Review.
Merge remote-tracking branch 'DAVA/development' into development-DAVA