your final changes look good to me. I ran the PvP test across an E810 and saw expected behavior.

Applied to next-dts, thanks Dean.