Merge branch 'develop' into 'main'

Merging "develop" to "main" branch

See merge request !77