#1030 Hotfix backport to 1.8.x