Martin Lueders requested to merge hotfix-9.2 into develop Feb 07, 2020

Description

Merge hotfix-9.2 back into the develop branch

News snippet

Merge hotfix-9.2 back into the develop branch

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.