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