v2022pre ← v2023dev0 backport: Merge the v2022pre and v2023dev0 branches again

Bring back together the two branches that inadvertently diverged when v2023dev0 has been forked and one of the MR did get landed to the old default branch, v2022pre, rather than being retargeted to the new one, v2023dev0.

Backport of !262 (merged)