Weld 1473

This pull request breaks tck tests and can't be merged till the tck is modified and a new release published.