this fixes #12029
Merge branch 'hotfix/12029'