Dealing with DW issues

Jira: CKI-38

Edited by CKI Bot