Just to keep the bug fix minimal, this allows to `cherry-pick` this pull in other branches.
This strategy does, in principle, also allow to update old releases without solving huge conflicts.