Resolves: #35562 --------- Co-authored-by: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>