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