Martin Lueders requested to merge release-11.0 into master Aug 19, 2021

Description

merge develop into master for release-11

News snippet

merge develop into master for release-11

Checklist

I have checked that my code follows the Octopus coding standards
I have added tests for all the new features added in this request.