PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 56651 Submitted by: Martin Matuska <martin@tradex.sk>