PR: 16255 Submitted by: Alexander Langer <alex@cichlids.com>
PR: 3757 Submitted by: Ruslan Shevchenko <rssh@cki.ipri.kiev.ua>