merge in lmp-release history after reset to 0499d4fc40cafb9fbb0e8eace1657cfaf79c5699