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