Fixes # Checklist My branch is up-to-date with development branch. Everything works and tested on latest stable Rust. Coverage and Linting have been applied Current behaviour New expected behaviour Change logs