Merge branch 'release/3.6.0'
Merge branch 'hotfix/facebook'
Merge branch 'hotfix/Case100'
Merge branch 'hotfix/active_card'
updates for upgrade and cancel
bump
Merge branch 'release/3.6.4' into production