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

Using "ours" strategy since we already merged the equivalent of #9866
into this branch.