Update ivy

Can you backport the first commit and I'll have Adam apply across branches.

Thanks!