Merge pull request #1736 from antonio-nino-diaz-arm/an/maintainers