merge in lmp-release history after reset to d0fded31e473e909c018f534d3019fb5168bdcd6