Marked as draft because v2024 is frozen.
cc @gaw1lud
requested review from @daissi
marked this merge request as ready
merged