[DF-1379] issue is fixed.
Merge remote-tracking branch 'DAVA/development-qa' into development-qa-DAVA