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