[DF-1806], [DF-1807] are fixed.
Merge remote-tracking branch 'origin/development' into DAVA_development