Merge pull request #11697 from neheb/port