Merge branch 'bug28348_034' into bug28348_035