Dealing with DW issues

Jira: CKI-38

Jira: CKI-6384

Jira: CKI-6452

Edited by CKI Bot