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