merge in lmp-release history after reset to 955e24d3a8e218d4711cabc6558781e095011132