Backport 9738 stable7

Backport of #9738 stable7