PR: 6281 Submitted by: SADA Kenji <sada@e-mail.ne.jp>
PR: 3757 Submitted by: Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>