Merge 4.8.4-1 changes back into main

As decided on previous dev meetings, the releases v4.8.3-1 and v4.8.4-1 were done from a separate branch. We can find them in release_4.8.4.

We need to merge them back into main before release v4.8.5-1.

Since gitlab is configured for fast-forward merge requests (multiple merge request types are not supported, as previously discussed in #263 (closed)), we cannot use the MR mechanism without loosing the history of this branch.

Therefore, this will be a manual merge, to be performed by me.

EDIT: It was actually not necessary to push directly to main, and instead still rely on the MR platform from gitlab. These were the steps:

• Create new branch main_proxy, from main.
• Locally, merge feature_branch into main_proxy. Fix all conflicts and commit.
  • main_proxy will preserve the history of both feature_branch and main.
• Push main_proxy to gitlab.
• Create merge-request from main_proxy into main.
• After approval - disable squash, do not rebase - and merge to main.