Merge branch 'develop' into 'main'

MR for Release 2024Q4

See merge request !9