merge in klp-release history after reset to klp-dev