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