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