Backport r13793 to 8.09