Merge branch 'bug29145_029' into maint-0.4.0