Merge remote branch 'public/bug1859_021' into maint-0.2.1