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