COMP: More LegacyIO fixes.
Merge branch 'bug-14866-Fix6'