sync the API with the latest changes (reverted from commit 7e04b47ea72d84edd49978a635777db53f63faad)