Wip/fix ivy resolution issue

Fixes ivy resolution failures for 0.13.5.  Last fix before next RC.

Review by @eed3si9n