merge in ics-mr1-release history after reset to ics-mr1
tree: 33c8e234355554fa8318d4a6c9e98baba4285485
  1. core/
  2. services/