[DF-5580] fix DVASSERT
Revert "[DF-5580] fix DVASSERT"

This reverts commit 61101175fed0bcafb6649cbfc57a0e72e752b2c7.
Merge branch 'development' into virtual_physical_refactor