Merge "API review: Spell out subscription"