Merge branch 'bug24367_032_squashed' into maint-0.3.2