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