[1.4.x] Refs #7028 - Patch patch7028-1.4.5.patch applied.
Merge branch 'ticket_7028_1_4' into fcms_1_4_x