R3_6_maintenance - fix for 332637
5 files changed