PR: 29339 Submitted by: maintainer
Approved by: sobomax, obrien
Submitted by: bruno.schwander@technologist.com