backport commit r501