sync with SDK changes