backport r67246 from the trunk
3 files changed