I converted this to MR at https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/77 Waiting for CI to pass and for a second person to approve. Perhaps Daniel Black? Svante: Would you like to submit the two patches upstream as well?