Changes done and pending CI to validate that there are no unintended side effects: https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/52