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