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