Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Use "ours" strategy" to avoid taking bug2402 fix.