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