Merge remote-tracking branch 'origin/proposed_master'
Tested by Dimitris who used the proposed_master branch as reference in external projects. This has been tester with the trigger distribution which seems to work. So I believe that these changes work. In order to keep things
Showing with 202 additions and 221 deletions
general-cores @ a50772ea