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