am b9278c79: Keep history after reset to klp-dev

* commit 'b9278c793399822c36192b236ec29a769202ab02':