Remove duplicate function declaration introduced by last merge
Rename API function introduced by last merge, and document it
Rename API functions introduced by last merge
Add a wrapper for a new API function