Dealing with DW issues

Jira: CKI-6515

Jira: CKI-7442