When there's no intended URL, should default to /
Fix conflicts and merge 4.0.