**Fixes issue:** **Description:** **Please verify and check that the pull request fulfills the following requirements:** - [ ] Tests have been added for the bug fix or new feature - [ ] Docs have been added for the bug fix or new feature