Sync with SDK changes.
Version 0.4.2