Backport a94966e

From #14244