updates for upgrade and cancel
bump
Merge branch 'release/3.6.4'