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