merge in jb-release history after reset to master
tree: 5e862e038fb5e6b4a36529c50fb027cf80425e74
  1. core/
  2. services/