Co-authored-by: Trent Nelson <trent.a.b.nelson@gmail.com> (cherry picked from commit 29edb130cc)
29edb130cc