Support custom fixupUrl function; fixes #17643