Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4