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