Merge "API tweaks round 2"