Main merge with 4.8.4
Summary
This MR is for review purposes only.
The real merge (with exactly the same changes) will be pushed directly to merge, in order to preserve the history of the commits associated with releases v4.8.3-1 and v4.8.4-1.
Otherwise, gitlab would force a rebase which would affect the history of the previous commits, tags and merge requests.
This is discussed with more detail in #293 (closed).