merge in jb-mr2-release history after reset to master
tree: 545ab555e88cc23bd69165de46e3312835839b2b
  1. core/
  2. services/