Merge branch 'sweep-opt' of git.rwth-aachen.de:acs/public/simulation/DistAIXFramework/distaix into sweep-opt