Revert "Remove historical + convention in URLs"

This reverts commit 625ecc7a20e248e11797a8ae87297b6c4e47756c.
auto-merge staging into master