merge in lmp-release history after reset to 515a59097e8b6d87023b824554e82b98aca8edf5