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

Lluis Gifre Renomrequested to merge
feat/231-merge-hackfest-5-in-develop-and-related-code-fixes into develop

Closes #231 (closed)

Merge request reports