Merge changes from topic 'api_review' into nyc-dev

* changes:
  Api review: Settings.
  Reduce spacing.