**Are there any issues addressed by this pull-request?**

Name them here as a comma-sperated list of short-hashes.

**What are you doing in this pull-request in general?**

Describe the general improvement and changes you propose and why you are doing so.

**What are possible side-effect?**

Can you already imagine side-effects that could accour in the long-run?

**Did you write tests and what are you testing?**

What do you test about your new code?
