Merge pull request #9492 from jwilk/teamcoco