merge in lmp-release history after reset to a67ced9746e6f0d4e03ff8007682091afea71f6c