(cherry picked from commit 2a7bacbd91) Co-authored-by: Eric V. Smith <ericvsmith@users.noreply.github.com>
2a7bacbd91