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