Dealing with DW issues

Jira: CKI-38

Jira: CKI-6385

Edited by CKI Bot