DEV: Add latest improvements from core (PR #55)

And less extreme timeouts.

GitHub