Merge changes from topic 'cps' into nyc-dev

* changes:
  Api updates.
  Note timezone changes.