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