Merge pull request #11208 from neheb/ip