Temporary tweaks to analyze a new bug.
Introduced massive linking test.