Draft: WIP: Changes by donquixote, part1
This part contains just minor changes.
This is WIP for now, don't merge yet.
Other stuff will happen in a separate branch / MR.
This part contains just minor changes.
This is WIP for now, don't merge yet.
Other stuff will happen in a separate branch / MR.