ISPN-3061 Total Order Tweaks