merge in lmp-release history after reset to bc7ffeda98a861e346c30c771d3258030f7fcf21