Merge branch 'feat/231-merge-hackfest-5-in-develop-and-related-code-fixes' into 'develop'

Resolve "Merge Hackfest 5 in `develop` and related code fixes"

See merge request !298