PR: 57682 Submitted by: Thierry Thomas <thierry@pompo.net>
PR: 54762 Submitted by: Thierry Thomas <thierry@pompo.net>