Martin Lueders requested to merge hotfix-11.2 into develop Sep 11, 2021

Description

Merge hotfix-11.2 back into develop (not yet merged into master)

News snippet

Merge hotfix-11.2 back into develop

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.