Merge branch 'main' into basop-2597-harmonize-shapespectrum