Merge branch 'hotfix/paypal'
Edit title
Merge branch 'hotfix/post-edit' into develop