This PR will... Why is this Pull Request needed? Are there any points in the code the reviewer needs to double check? Resolves issues: Checklist changes have been done against master branch, and PR does not conflict new unit / functional tests have been added (whenever applicable) API or design changes are documented in API.md