PR: 17668 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
PR: 6166 Submitted by: Andrey Zakhvatov <andy@icc.surw.chel.su>