Backport 9672 stable7