Merge branch 'hotfix/failing-test'
Change to trigger a build.
Merge branch 'hotfix/build-trigger' into dev