PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 22215 Submitted by: Roman Shterenzon <roman@xpert.com>