PR: 103513 Submitted by: gabor (maintainer) Based on: 103360 submitted by Gea-Suan Lin <gslin@gslin.org>