merge in nyc-mr1-release history after reset to nyc-mr1-dev
tree: 44fa1aec805c93f2f76375ead4b9aa5ee7f9f0de
  1. service/
  2. tests/