merge in lmp-release history after reset to a85567e5e8f009e0e88f58ab3cec47948faf2988