Describe your proposal. Mention any issue this PR resolves or is related to. --- Checklist: * [ ] Rebased against `dev` branch * [ ] My name is in the resp. CONTRIBUTORS/AUTHORS file * [ ] Followed [the seven rules of great commit messages](https://chris.beams.io/posts/git-commit/#seven-rules)