Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Using "ours" strategy to avoid taking changes.