fixup! fixup! payments architecture
Merge branch 'master' into gh-pages