(cherry picked from commit 9fcf1db871) Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
9fcf1db871