[ISSUE #9481]Fix Issue 4050 didn't fix completely

[WJ66880]

Which Issue(s) This PR Fixes

Fixes #9481

Brief Description

How Did You Test This Change?

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.97%. Comparing base (53a3f69) to head (c206b41).

Additional details and impacted files

@@              Coverage Diff              @@
##             develop    #9482      +/-   ##
=============================================
- Coverage      48.15%   47.97%   -0.18%     
+ Complexity     12027    11982      -45     
=============================================
  Files           1308     1308              
  Lines          92253    92253              
  Branches       11808    11808              
=============================================
- Hits           44425    44261     -164     
- Misses         42343    42483     +140     
- Partials        5485     5509      +24     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.