[DF-1622], [DF-1674] are fixed.
Merge remote-tracking branch 'origin/to_master' into DAVA_to_master_qa
Merge remote-tracking branch 'origin/to_master_qa' into DAVA_to_master