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