Port e89317d4c1da991b728b6d4a21671ed33f057cc4 Co-authored-by: Renaud Chaput <renchap@gmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>