Resolving conflicts
Merge branch 'djere_branch' of https://github.com/WiechersV/exo_help_ticket