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