merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
tree: 21fccb2f0b22b130e7b6d1ba27b5275e3bac2981
  1. core/
  2. services/