Remove historical + convention in URLs
auto-merge staging into master