Merge branch 'tundebabzy-issue-11080' into hotfix