Merge pull request #18307 from hrwX/stat-fix

fix(Quality): miscellaneous fixes