Merge branch 'bug28348_036'