Fixes #4321
Merge branch 'hotfix-4.3.3'