rebased with main and merge conflicts resolved

5 jobs for feature/analysis_suite_rebase in 2 minutes and 34 seconds (queued for 7 seconds)