Apply more changes from MR 128
Attempt to apply the remaining changes from !128 (closed) to 'trixie/main'. @msaied93 Please either rebase your source branch or follow this MR.
Edited by Daniel Leidert
Attempt to apply the remaining changes from !128 (closed) to 'trixie/main'. @msaied93 Please either rebase your source branch or follow this MR.