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