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