merge in lmp-release history after reset to 793a854e4547fa43632907a987684cadc93eb5e2