Merge branch 'main' into basop-2364-harmonization-of-mult_harm