Merge "API updates to respond to comments"