Merge pull request #5201 from alexrp/code-owners