Sync api with nbapi

Sync api with nbapi