merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d