Update purchase flow
Merge origin/master