PR: 46620 Submitted by: Thierry Thomas <thierry@pompo.net>
PR: 8503 Submitted by: Abel Chow <achow@transoft.net>