in the last commit.
PR: 58166 Submitted by: Cheng-Lung Sung <clsung@dragon2.net>
PR: 52316 Submitted by: Alexey V. Antipovsky <kemm@in-line.ru>