(cherry picked from commit 811d920b93f09fde5bdf093ea1ff0b5000c4eec5) Co-authored-by: Mhowser <mhowser265@gmail.com>