Merge "Rename exported API and improve the documentation"