Created by: bardiharborow
Fixes #20384 (closed). We probably need to merge this fix in even if we do end up going with #20388 (closed).
Created by: bardiharborow
Fixes #20384 (closed). We probably need to merge this fix in even if we do end up going with #20388 (closed).