changes to maintain all data in canceled order
Merge remote-tracking branch 'origin/feature-cancelorderupdates' into develop
Updated Version 3.2.023.017