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