PR: 52719 Submitted by: maintainer
40000. PR: 51794 Submitted by: Kirill Ponomarew <ponomarew@oberon.net>