Supa Dev

Results 2 issues of Supa Dev

#### Pull Request (PR) description #### This Pull Request (PR) fixes the following issues

tests-fail
needs-work
merge-conflicts