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