Description

Cleaning of a previous merge request which apparently got lost.

News snippet

Cleaning of the code.

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.