merge in klp-dev history after reset to master