(cherry picked from commit 978384b27e) Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
978384b27e