R3_6_maintenance - Fix for 326434
3 files changed