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