Update to API versions.
Merge branch 'develop'