Backport issue 10764