Backport r1811