[DF-1504] - additional cases found were fixed.
Merge remote-tracking branch 'DAVA/development-qa' into development-qa-DAVA