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