(cherry picked from commit 824994db69f8f09fc2e051abe4f5a8c0f090a123) Co-authored-by: Michael Vines <mvines@gmail.com>