merge in lmp-release history after reset to bf16485a3626782b50d8c71c69a5771851fe930c