Merge branch 'hotfixes' into 'main'

hotfix after 3.09 release

See merge request !137