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