Draft: review stable..devel
Do not merge this MR. It's here solely to make it easier to review the stable..devel diff, which IMO we should do before we release 5.0~beta1.
Do not merge this MR. It's here solely to make it easier to review the stable..devel diff, which IMO we should do before we release 5.0~beta1.