Merge pull request #11587 from neheb/io