merge in lmp-release history after reset to f033aa4da55bc5b2f47594d3b503688a8acea915