Backport two changes from the `feature/retry-to-use-use` branch