Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4