Dev

[alissonpelizaro]

Fixes #[include a number of issue this PR is fixing].

Summary of changes proposed in this Pull Request:

PR checklist:

• [x] Updated relevant documentation
• [x] Updated CHANGELOG.md
• [x] Added tests for my change