merge in lmp-release history after reset to 61833de613990f2fdaf357bb3d854d72a4980890