Dealing with DW issues

Jira: CKI-6515

Edited by Tales da Aparecida