porting changes from original pr #2081

[ATorrise]

What It Does fixes #1031 for v2 port of #2081

Review Checklist I certify that I have:

• [x] tested my changes
• [x] added/updated automated tests
• [x] updated the changelog
• [x] followed the contribution guidelines

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 91.06%. Comparing base (61838b1) to head (edb5b1b). Report is 1 commits behind head on master.

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #2103 +/- ## ======================================= Coverage 91.06% 91.06% ======================================= Files 636 636 Lines 18993 19000 +7 Branches 3985 3925 -60 ======================================= + Hits 17296 17303 +7 Misses 1696 1696 Partials 1 1 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[sonarcloud[bot]]

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
92.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud