merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 1bc1480afd3bf2b88b9d0a03f1518e263471ebea
  1. core/
  2. services/