sync SDK with changes from public