reapply of r57378 to fix bug 1725856
2 files changed