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