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