Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2