merge in lmp-release history after reset to ecaae06ed2e694a6985e8da14919b4384355b89f