Merge branch 'main' into 316-update-of-mem_analysis-m