Merge "Revert "Fix volume value and DPE range"" into main