merge in lmp-release history after reset to af9c6d082cca2c0c1fe15c4976414763824f60e3