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