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