PR: 99634 Submitted by: Remy Oudompheng <oudomphe@clipper.ens.fr> Patch by: maintainer Approved by: arved (mentor)