Please include the existing github issue number where relevant
- I have merged the latest changes from the dev branch
- I have successfully run a local build
- I have included unit tests for the issue/feature
- I have targeted the PR against the latest dev branch