8cb58c1560
(cherry picked from commit d4e3d47f56)
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>