Some of the integration tests were broken by unrelated work, trying to resolve this seriously delayed merging this work.