merge in lmp-release history after reset to 0021c30190af49119ee319af6b207643b417c6c3