Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

("-s ours" merge to avoid taking reversion of #15064)