WIP: Merge hotfix 10.1 part2
Description
Add here a short description of what this merge request is about. Please mention if you changed any input option or the defaults in any way. Also say here if this merge request fixes any issue (see the gitlab documentation on how to do this).
News snippet
Add here a one line description to be included in the Changes page. You can delete this section if the changes are trivial and of no consequence for the users.
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.