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