Merge branch 'hotfix/jira-0000'
Added a failing test to see if the build breaks
Merge branch 'hotfix/failing-test' into dev