PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 26595 Submitted by: Yoshihiko Sarumaru <mistral@imasy.or.jp>