Add Key Management
Update the API

includes all relevant changes since the version I integrated