The committed version differs from the one in the PR. It is supplied by the maintainer after a round of fixes. PR: 28127 Submitted by: Arnaud S. Launay <asl@launay.org> OK'ed by: markm
