merge in lmp-release history after reset to b15bad78f0df5e147272e078f8ff7a8bee04da6c