Upate to work with the latest Iris#7

co-dan wants to merge 3 commits into

mainlogsem/gitrees:mainfrom

bump_irislogsem/gitrees:bump_irisCopy head branch name to clipboard