re #9734 3rd pass of the links