Merge "API council suggested edits, part 3"