[LPS-33393 could fix this issue?] LPS-33252

LPS-33252 - Fix for the issue:

I did test this, but not all the cases. I think DM operations should have strong test harness.