Merge branch 'bug26470_032' into maint-0.3.3