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