Added API docs for #2008