PR: 46726 Submitted by: Christopher Sharp <csharp@gmx.net>
PR: 37491 Submitted by: Vsevolod Lobko <seva@sevasoft.kiev.ua>