v9 (v8.1). Rebase compat and main tests atop latest "URL integration"
changes.

Please excuse the hassle. (FWIW, there's no material difference outside
of commit summaries).