Merge pull request #9476 from neheb/foss