Implement for v11, except for the part in my note is practically too complex (links could take too many different forms, and there could be huge amounts of content to search and replace - too much of a minefield).
Still needs merging in, currently is in a customer branch.
Still needs merging in, currently is in a customer branch.