While here, pass maintainership to submitter PR: 231102 Submitted by: Vinícius Zavam <egypcio@googlemail.com>