Backport 14992

cc #14992