merge in lmp-release history after reset to 35eb9ea18ea3086d9f264c285988246116624a6e