SDK update: API changes, fixes #1