Merge "API feedback with better documentation." into sc-dev