PR: 56608 Submitted by: Lars Thegler <lars@thegler.dk>
PR: 32164 Submitted by: Sergey Skvortsov <skv@protey.ru>