Merging api-doc changes