[[ Bug 13450 ]] Apply previous bugfix 11485 to refactor branch
Merge pull request #1318 from runrevian/bugfix-13450

[[ Bug 13450 ]] Apply previous bugfix 11485 to refactor branch