Stable7 backport issue 10674