Fixing IAP bindings
Merge branch 'base' into mandarin