Merge branch 'packages/add_amber24' of...

Merge branch 'packages/add_amber24' of https://gitlab.epfl.ch/SCITAS/software-stack/scitas-software-stacks into packages/add_amber24