merge in lmp-release history after reset to d6fc0515124cf5b7ebc93d926565a10295548de5