Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9