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