Patch to fix issue 4186 (but it requires DBS3 fix for their issue dmwm/DBS#381)