Merge pull request #8518 from neheb/i