Merge pull request #6649 from neheb/int