@rgoj just to prepare you: this will create merge conflicts. Take a look at #722