Backported fix for bug 291716 to R3_4_maintenance.
2 files changed