master
Fix an API change from an old commit (#19880)
Catch the exception and log a message
Update yard docs
Switch to a more generic upstream resolvers model
Refactor resolver types