Merge remote branch 'public/bug2363' into maint-0.2.2