Backport the fix of the page URL resolution including a custom content type.