Change request to feature spec.
Changes for 2-0-stable branch.