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