SDK upgrade and schema change
Merge branch 'staging'