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