Merge branch 'main' into fix/paraller-flexibility-computation