PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 20163 Submitted by: Leo Kim <leo@florida.sarang.net>