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