Merge "Make slight API and doc adjustments"