Payment API Compatibility
Merge branch 'refs/heads/dev-api' into dev