merge in ics-release history after reset to master
tree: 7f7e261bac0d0277f74a1359f48d6ecdcf9f6a38
  1. core/
  2. services/