Merge "API review: Additional documentation & annotation"