closes <!--list issues closed by this PR -->

**Prerequisites**:

- [ ] Unless it is a hotfix it should be merged against the `dev` branch
- [ ] Branch is up-to-date with the branch to be merged with, i.e. `dev`
- [ ] Build is successful
- [ ] Code is cleaned up and formatted

### Summary

<!--
  describe what this PR changes,
  including some screenshots if it is a visual feature
-->
