Merge "API tweaks in response to feedback"