**Description** Fixes #ISSUE **Checklist** - [ ] Unit tests updated - [ ] End user documentation updated