(cherry picked from commit 92a9e98024) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
92a9e98024