Fixes #38696 Co-authored-by: James Cammarata <jimi@sngx.net> (cherry picked from commit 30d93995dd)
30d93995dd