Port update from 4.10 to 4.17
Class Changed From-To: update->maintainer-update It's a maintainer-update
Class Changed From-To: update->maintainer-update It's a maintainer update
State Changed From-To: open->closed Committed, thanks