Merge "Update and enrich API documentation"