PR: 14926 Submitted by: maintainer
Closes PR 2066. Submitted by: Mikhail Teterin <mi@aldan.ziplink.net>