merge in klp-release history after reset to master
tree: f2f0bfe17a82778577a4b9117ad81ea95ab5b402
  1. core/
  2. services/