(cherry picked from commit 2cc2fb9852389b2942ee9758826426fee257e5e8) Co-authored-by: Marcus Howser <mhowser265@gmail.com>