merge in lmp-release history after reset to 489e29ecbfd2ffe10ebd199204f3ee242b1bd1f8