merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 9efbe0e5dd288903d7fd7ee7e1cd67f7f884cacf
  1. core/
  2. services/