Merge pull request #1808 from sandrine-bailleux-arm/sb/maintainers