(cherry picked from commit b577340eb5bc3b72549f0544b50e2e37df78bf12) Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>