Backport to 10.2 branch