merge in lmp-release history after reset to 0893eaf7d21e3a50b81324673eaa91a6b77a39c2