Backport 1.4.3 Hotfix