Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1