Merge branch '2024Q2_RC' into main (removing obsolete files) #30