COMP: Removed more dependencies to LegacyIO.
Merge branch 'bug-14866-Fix1'