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