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